Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1731 #1740

Merged
merged 2 commits into from
Jun 18, 2020
Merged

Fix #1731 #1740

merged 2 commits into from
Jun 18, 2020

Conversation

wbloszyk
Copy link
Member

@wbloszyk wbloszyk commented May 5, 2020

Subject

It is quick fix. Other things like support for BlockBundle 4.x will be add with sonata-project/SonataBlockBundle#700

I am targeting this branch, because it is BC. (Revert some changes)

Closes #1731, #1732, #1737

@core23
Copy link
Member

core23 commented May 5, 2020

Can you add some basic test, so we can check for any compiler errors @wbloszyk ?

core23
core23 previously approved these changes May 5, 2020
phansys
phansys previously approved these changes May 5, 2020
@wbloszyk
Copy link
Member Author

wbloszyk commented May 5, 2020

I only revert some changes from 9533247. I dont think test is needed here.

Copy link
Member

@franmomu franmomu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests fail, if we are going to revert it, I think it's better to just revert it completely instead of doing it manually.

@wbloszyk
Copy link
Member Author

wbloszyk commented May 5, 2020

@franmomu Lookat tests. It blockBundle issue. sonata-project/SonataBlockBundle#701 (review) should fix it.

@franmomu
Copy link
Member

franmomu commented May 6, 2020

So I guess it will need a release of BlockBundle and bump to that version in this PR.

@core23
Copy link
Member

core23 commented May 8, 2020

There is a new block release, can you please test this @wbloszyk

@wbloszyk wbloszyk closed this May 8, 2020
@wbloszyk wbloszyk reopened this May 8, 2020
@wbloszyk wbloszyk dismissed stale reviews from phansys and core23 via 15524bb May 8, 2020 21:54
@wbloszyk
Copy link
Member Author

wbloszyk commented May 8, 2020

@wbloszyk wbloszyk closed this May 8, 2020
@wbloszyk wbloszyk reopened this May 8, 2020
@wbloszyk
Copy link
Member Author

wbloszyk commented May 8, 2020

@core23 I check with --prefer-lowest. It is OK.

@core23
Copy link
Member

core23 commented May 8, 2020

Can you please rebase to trigger Travis

@wbloszyk wbloszyk closed this May 8, 2020
@wbloszyk wbloszyk reopened this May 8, 2020
@wbloszyk
Copy link
Member Author

wbloszyk commented May 8, 2020

@core23 close and open also trigger Travis

@wbloszyk wbloszyk closed this May 8, 2020
@wbloszyk wbloszyk reopened this May 8, 2020
composer.json Outdated
@@ -79,7 +79,7 @@
"nelmio/api-doc-bundle": "^2.13.4",
"sensio/framework-extra-bundle": "^5.1",
"sonata-project/admin-bundle": "^3.18.3",
"sonata-project/block-bundle": "^3.17",
"sonata-project/block-bundle": "^3.18",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No adjustment here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is require-dev section. Someone can use --no-dev so I change conflict too. Now obły 3.18.5 is possibile to use. Adjustment is not require here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to reconsider because of the timeouts. Requiring 3.18.5 will reduce the problem space and could help

@wbloszyk wbloszyk closed this May 9, 2020
@wbloszyk wbloszyk reopened this May 9, 2020
@wbloszyk
Copy link
Member Author

wbloszyk commented May 9, 2020

@greg0ire Can you look at travis? Timeout on --prefer-lowest again.

@wbloszyk wbloszyk closed this May 18, 2020
@wbloszyk wbloszyk reopened this May 18, 2020
@greg0ire
Copy link
Contributor

greg0ire commented May 18, 2020

I noticed that things went really fast locally, so let's see if this could have to do with xdebug, which is enabled by default on Travis, and which we disable, maybe a little too late.

@greg0ire
Copy link
Contributor

No improvement… bummer, let's try something else.

@greg0ire
Copy link
Contributor

Composer seems to be on a loop 😅

@greg0ire
Copy link
Contributor

I cancelled your job, it's over 10 mn…

@wbloszyk
Copy link
Member Author

@greg0ire I run it without change in composer.json and it worked. It look like something is wrong with upgrade sonata-project/block-bundle conflict/require-dev.

@greg0ire
Copy link
Contributor

greg0ire commented May 18, 2020

Locally, this takes 30 passes for me to resolve… so maybe this also has to do with php 7.2 or something.

@core23
Copy link
Member

core23 commented Jun 17, 2020

Can you finish this, so we can create a bugfix? @wbloszyk

@jordisala1991
Copy link
Member

A rebase could fix the problem

core23
core23 previously approved these changes Jun 18, 2020
@wbloszyk
Copy link
Member Author

I use CoreBundle, sorry, fixed.

@jordisala1991 jordisala1991 merged commit 5d4d102 into sonata-project:3.x Jun 18, 2020
@jordisala1991
Copy link
Member

Thank you @wbloszyk @franmomu @greg0ire

@wbloszyk wbloszyk deleted the fix_block branch June 18, 2020 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
7 participants